Fall back from partial pull when on VFS #2140
Merged
+70
−42
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Oct 17, 2024
|
Possibly fixes containers/podman#24308 . |
mtrmac
added a commit
to mtrmac/libpod
that referenced
this pull request
Oct 17, 2024
> go mod edit -replace github.com/containers/storage=github.com/mtrmac/storage@vfs-fallback Signed-off-by: Miloslav Trmač <mitr@redhat.com>
|
Confirming that this fixes the single reproducer in containers/podman#24308 . |
giuseppe
approved these changes
Oct 18, 2024
| return nil, errors.New("both zstd:chunked and eStargz TOC found") | ||
| } | ||
|
|
||
| // convertImages also serves as a “must not fallback to non-partial pull” option (?!) |
There was a problem hiding this comment.
yes, for now at least it does. Because if that is set, we expect that every image is pulled using the partial pull code path, so that we can enforce composefs.
|
/lgtm |
... to centralize the fallback allowed / required logic. Should not change behavior, apart from maybe some error text. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Instead of sharing the badRequestErr logic, duplicate it. That's a bit ugly, but we get better debug messages and a more traditional control flow. Should not change behavior, except for debug messages. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Use switch to handle the various TOC presence cases Signed-off-by: Miloslav Trmač <mitr@redhat.com>
... and other graph drivers which don't support partial pulls. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
mtrmac
added a commit
to mtrmac/libpod
that referenced
this pull request
Oct 18, 2024
> go mod edit -replace github.com/containers/storage=github.com/mtrmac/storage@vfs-fallback Signed-off-by: Miloslav Trmač <mitr@redhat.com>
mtrmac
added a commit
to mtrmac/libpod
that referenced
this pull request
Oct 18, 2024
> go mod edit -replace github.com/containers/storage=github.com/mtrmac/storage@vfs-fallback Signed-off-by: Miloslav Trmač <mitr@redhat.com>
mtrmac
added a commit
to mtrmac/libpod
that referenced
this pull request
Oct 18, 2024
> go mod edit -replace github.com/containers/storage=github.com/mtrmac/storage@vfs-fallback Signed-off-by: Miloslav Trmač <mitr@redhat.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe, mtrmac, vrothberg The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
First refactor the logic a bit, to separate “are partial pulls allowed” from “set up partial pulls”.
See individual commits.
@giuseppe RFC on the logic, WRT composefs integrity enforcement.
Currently untested, that’s going to happen in containers/podman#24287 .